bitkeeper revision 1.1236.32.4 (4236d5a4kQci3u8a878XDs-1qIBjPw)
authormafetter@fleming.research <mafetter@fleming.research>
Tue, 15 Mar 2005 12:31:32 +0000 (12:31 +0000)
committermafetter@fleming.research <mafetter@fleming.research>
Tue, 15 Mar 2005 12:31:32 +0000 (12:31 +0000)
Merge maf46@burn.cl.cam.ac.uk:xen-shadow-mode.bk
into fleming.research:/scratch/fleming/mafetter/scrub

Signed-off-by: michael.fetterman@cl.cam.ac.uk

Trivial merge